From a9b283a1ca2a000db508d26e04398cd3ad946462 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Thu, 12 Dec 2019 17:41:51 +0000
Subject: [PATCH] Improve d/tests/build

---
 debian/changelog   |  7 +++++++
 debian/tests/build | 20 +++++++++++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d15ff8513e..4a7889391f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,13 @@ gtk+4.0 (3.96.0-3) UNRELEASED; urgency=medium
     Implicitly returning None is OK, but explicit is better than implicit.
   * d/tests/python3-gi: Make executable
   * d/tests/build, d/tests/python3-gi: Mark as superficial
+  * d/tests/build: Use correct compiler for proposed autopkgtest
+    cross-architecture testing support, based on a patch for clutter-1.0
+    by Steve Langasek
+  * d/tests/build: Fix shellcheck warnings
+  * d/tests/build: Show commands before they are executed
+  * d/tests/build: Fail if using an undefined variable ("unofficial strict
+    mode")
 
  -- Simon McVittie <smcv@debian.org>  Mon, 25 Nov 2019 11:25:30 +0000
 
diff --git a/debian/tests/build b/debian/tests/build
index c94ef03cc4..7dbb9edddb 100755
--- a/debian/tests/build
+++ b/debian/tests/build
@@ -8,10 +8,22 @@
 # Author: Martin Pitt <martin.pitt@ubuntu.com>
 
 set -e
+set -u
+set -x
 
 WORKDIR=$(mktemp -d)
-trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM
-cd $WORKDIR
+cleanup () {
+    rm -fr "$WORKDIR"
+}
+trap cleanup 0 INT QUIT ABRT PIPE TERM
+cd "$WORKDIR"
+
+if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then
+    CROSS_COMPILE="$DEB_HOST_GNU_TYPE-"
+else
+    CROSS_COMPILE=
+fi
+
 cat <<EOF > gtktest.c
 #include <glib.h>
 #include <gtk/gtk.h>
@@ -51,7 +63,9 @@ int main(int argc, char **argv)
 }
 EOF
 
-gcc -o gtktest gtktest.c `pkg-config --cflags --libs gtk4`
+# Deliberately word-splitting, that's how pkg-config works:
+# shellcheck disable=SC2046
+"${CROSS_COMPILE}gcc" -o gtktest gtktest.c $("${CROSS_COMPILE}pkg-config" --cflags --libs gtk4)
 echo "build: OK"
 [ -x gtktest ]
 xvfb-run -a -s "-screen 0 1024x768x24" \
-- 
2.30.2